From 63c541925d0d9011f7e8cdf822b8a29b92532bd9 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 14 Feb 2021 18:43:15 +0000 Subject: [PATCH] Record some of the patches as specifically rejected by upstream --- ...ftest_compare_surfaces-Report-how-much-the-images-diffe.patch | 1 + .../reftests-Allow-minor-differences-to-be-tolerated.patch | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch b/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch index 1cd5439c0e..38fecd48d0 100644 --- a/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch +++ b/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch @@ -9,6 +9,7 @@ can get an idea of what's a rounding error and what's a serious problem. Signed-off-by: Simon McVittie Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3195 +Applied-upstream: no, upstream want reftests to be a strict pass/fail with identical results required --- testsuite/gsk/compare-render.c | 10 +++++++++- testsuite/reftests/gtk-reftest.c | 9 ++++++++- diff --git a/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch b/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch index 4a44832763..1fd7144cab 100644 --- a/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch +++ b/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch @@ -28,6 +28,7 @@ test-case as "TODO". Signed-off-by: Simon McVittie Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/3195 +Applied-upstream: no, upstream want reftests to be a strict pass/fail with identical results required --- testsuite/gsk/compare-render.c | 43 ++++++++++++++++++++++++++++++++++++-- testsuite/reftests/gtk-reftest.c | 43 ++++++++++++++++++++++++++++++++++++-- -- 2.30.2